jhbuild wrapper: Re-set typelib path to the src dir

This allows us running uninstalled. While we're at it, though, remove
JHBUILD_TYPELIBDIR. jhbuild shell should add its own stuff to GI_TYPELIB_PATH,
and we don't want to half reimplement jhbuild. The wrapper script should be
solely for the case of running from the source directory, and not care about
jhbuild at all.

diff --git a/configure.ac b/configure.ac
index c9ed182637b435f2856e6529664161dff98e1cb2..3951c662c25d84e54f19595b263438b9d8a675e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,8 +108,6 @@ AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're li
 AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
 
 GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
-JHBUILD_TYPELIBDIR="$INTROSPECTION_TYPELIBDIR"
-AC_SUBST(JHBUILD_TYPELIBDIR)
 
 saved_CFLAGS=$CFLAGS
 saved_LIBS=$LIBS

diff --git a/src/Makefile.am b/src/Makefile.am
index ca058e5c4dbdcad78b71181e961662eb368ccaeb..f1721fbd60c127f6f8e5cc019bc4d4238cdfc57e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,6 @@ generated_script_substitutions = \
            -e "s|@libexecdir[@]|$(libexecdir)|g" \
            -e "s|@libdir[@]|$(libdir)|g" \
            -e "s|@pkglibdir[@]|$(pkglibdir)|g" \
-           -e "s|@JHBUILD_TYPELIBDIR[@]|$(JHBUILD_TYPELIBDIR)|g" \
            -e "s|@pkgdatadir[@]|$(pkgdatadir)|g" \
            -e "s|@PYTHON[@]|$(PYTHON)|g" \
            -e "s|@VERSION[@]|$(VERSION)|g" \

diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in
index e2c0a745c64683fe118c6857c2c76a54f8370f76..e695e585200371a67c667b190d7b0097f41e3556 100755 (executable)
--- a/src/gnome-shell-jhbuild.in
+++ b/src/gnome-shell-jhbuild.in
@@ -67,22 +67,21 @@ def start_shell():
     if os.path.exists(os.path.join(self_dir, 'gnome-shell-jhbuild.in')):
         running_from_source_tree = True
         top_dir = os.path.dirname(self_dir)
-        typelib_dir = '@JHBUILD_TYPELIBDIR@:' + os.path.join(top_dir, "src")
         js_dir = os.path.join(top_dir, "js")
         data_dir = os.path.join(top_dir, "data")
+        typelib_dir = os.path.join(top_dir, "src")
+        if 'GI_TYPELIB_PATH' in os.environ:
+            typelib_dir += ':%s' % (os.environ['GI_TYPELIB_PATH'],)
     else:
         running_from_source_tree = False
         js_dir = os.path.join('@pkgdatadir@', 'js')
-        typelib_dir = '@JHBUILD_TYPELIBDIR@'
-
-    if os.environ.has_key('GI_TYPELIB_PATH'):
-        typelib_dir = typelib_dir + ":" + os.environ.get('GI_TYPELIB_PATH')
 
     # Set up environment
     env = dict(os.environ)
     if running_from_source_tree:
         env.update({'GNOME_SHELL_JS'       : js_dir,
                     'GNOME_SHELL_BINDIR'   : self_dir,
+                    'GI_TYPELIB_PATH'      : typelib_dir,
                     'GNOME_SHELL_DATADIR'  : data_dir,
                     'GSETTINGS_SCHEMA_DIR' : data_dir })